From: Keir Fraser <keir.fraser@citrix.com>
Date: Fri, 4 Jun 2010 09:10:25 +0000 (+0100)
Subject: xl: fix network-list command line parsing
X-Git-Tag: archive/raspbian/4.8.0-1+rpi1~1^2~12024
X-Git-Url: https://dgit.raspbian.org/%22http://www.example.com/cgi/%22/%22http:/www.example.com/cgi/%22?a=commitdiff_plain;h=89c41cfacc1d7b96da82519c416c828bee8ea90a;p=xen.git

xl: fix network-list command line parsing

Command line arguments start at argv[2].

Signed-off-by: Jeremy Fitzhardinge <jeremy.fitzhardinge@citrix.com>
---

diff --git a/tools/libxl/xl_cmdimpl.c b/tools/libxl/xl_cmdimpl.c
index f29d3ceaad..54507e4583 100644
--- a/tools/libxl/xl_cmdimpl.c
+++ b/tools/libxl/xl_cmdimpl.c
@@ -3461,11 +3461,11 @@ int main_networklist(int argc, char **argv)
     libxl_nicinfo *nics;
     unsigned int nb;
 
-    if (argc < 2) {
+    if (argc < 3) {
         help("network-list");
         exit(1);
     }
-    while ((opt = getopt(argc, argv, "hl")) != -1) {
+    while ((opt = getopt(argc, argv, "h")) != -1) {
         switch (opt) {
             case 'h':
                 help("network-list");
@@ -3479,7 +3479,7 @@ int main_networklist(int argc, char **argv)
     /*      Idx  BE   MAC   Hdl  Sta  evch txr/rxr  BE-path */
     printf("%-3s %-2s %-17s %-6s %-5s %-6s %5s/%-5s %-30s\n",
            "Idx", "BE", "Mac Addr.", "handle", "state", "evt-ch", "tx-", "rx-ring-ref", "BE-path");
-    for (++argv, --argc; argc > 0; --argc, ++argv) {
+    for (argv += 2, argc -= 2; argc > 0; --argc, ++argv) {
         if (domain_qualifier_to_domid(*argv, &domid, 0) < 0) {
             fprintf(stderr, "%s is an invalid domain identifier\n", *argv);
             continue;